fix: <ImageFieldFile: None> is not JSON serializable
Se han modificado 2 ficheros con 14 adiciones y 5 borrados
+ 1
- 1
api/urls.py
@@ -240,7 +240,7 @@ urlpatterns += [ |
||
| 240 | 240 |
] |
| 241 | 241 |
|
| 242 | 242 |
urlpatterns += [ |
| 243 |
- url(r'^admin/complement/code$', complement_views.complement_code, name='complement_code'), |
|
| 243 |
+ url(r'^complement/code$', complement_views.complement_code, name='complement_code'), |
|
| 244 | 244 |
url(r'^admin/complement/code/list$', admin_views.complement_code_list, name='complement_code_list'), |
| 245 | 245 |
url(r'^admin/complement/code/audit$', admin_views.complement_code_audit, name='complement_code_audit'), |
| 246 | 246 |
url(r'^admin/complement/code/contacted$', admin_views.complement_code_contacted, name='complement_code_contacted'), |
+ 13
- 4
logs/models.py
@@ -2,7 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from django.db import models |
| 4 | 4 |
from django.utils.translation import ugettext_lazy as _ |
| 5 |
-from django_models_ext import BaseModelMixin, upload_file_url, upload_path |
|
| 5 |
+from django_models_ext import BaseModelMixin, upload_file_url, upload_path, upload_file_path |
|
| 6 | 6 |
from shortuuidfield import ShortUUIDField |
| 7 | 7 |
from TimeConvert import TimeConvert as tc |
| 8 | 8 |
|
@@ -155,24 +155,33 @@ class ComplementCodeLogInfo(BaseModelMixin): |
||
| 155 | 155 |
@property |
| 156 | 156 |
def shot_image_url(self): |
| 157 | 157 |
return upload_file_url(self.shot_image) |
| 158 |
+ |
|
| 159 |
+ @property |
|
| 160 |
+ def shot_image_path(self): |
|
| 161 |
+ return upload_file_path(self.shot_image) |
|
| 158 | 162 |
|
| 159 | 163 |
@property |
| 160 | 164 |
def invoice_image_url(self): |
| 161 | 165 |
return upload_file_url(self.invoice_image) |
| 166 |
+ |
|
| 167 |
+ @property |
|
| 168 |
+ def invoice_image_path(self): |
|
| 169 |
+ return upload_file_path(self.invoice_image) |
|
| 162 | 170 |
|
| 163 | 171 |
@property |
| 164 | 172 |
def data(self): |
| 173 |
+ model = ModelInfo.objects.get(model_id=self.model_id) |
|
| 165 | 174 |
return {
|
| 166 | 175 |
'user_id': self.user_id, |
| 167 | 176 |
'log_id': self.log_id, |
| 168 | 177 |
'name': self.name, |
| 169 | 178 |
'phone': self.phone, |
| 170 | 179 |
'model_id': self.model_id, |
| 171 |
- 'model_name': self.model_name, |
|
| 180 |
+ 'model_name': model.model_name, |
|
| 172 | 181 |
'sn': self.sn, |
| 173 |
- 'shot_image': self.shot_image, |
|
| 182 |
+ 'shot_image': self.shot_image_path, |
|
| 174 | 183 |
'shot_image_url': self.shot_image_url, |
| 175 |
- 'invoice_image': self.invoice_image, |
|
| 184 |
+ 'invoice_image': self.invoice_image_path, |
|
| 176 | 185 |
'invoice_image_url': self.invoice_image_url, |
| 177 | 186 |
'audit_status': self.audit_status, |
| 178 | 187 |
'is_contacted': self.is_contacted, |